From: Ari Roponen <ari.roponen@gmail.com>
Date: Fri, 14 Dec 2018 07:22:09 +0000 (+0200)
Subject: Fix crash in the Cairo build
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~3060^2~50
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2f72162243b293af9c204646ef6e777dc8222b52;p=emacs.git

Fix crash in the Cairo build

* src/ftcrfont.c (struct ftcrfont_info) [HAVE_HARFBUZZ]: New
member 'hb_font'.  (Bug#33739)
---

diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index e2f84d44fc2..6d74d937a73 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -41,6 +41,9 @@ struct ftcrfont_info
   bool maybe_otf;	  /* Flag to tell if this may be OTF or not.  */
   OTF *otf;
 #endif	/* HAVE_LIBOTF */
+#ifdef HAVE_HARFBUZZ
+  hb_font_t *hb_font;
+#endif  /* HAVE_HARFBUZZ */
   FT_Size ft_size;
   int index;
   FT_Matrix matrix;